Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 00:47:31 +0000 (17:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 00:47:31 +0000 (17:47 -0700)
commit8c8de9e5b756b6fead0d34bf8105713ab57c2048
tree6d7caca31e8777e1cabb634ffe238de588a5934b
parent519336827fe196d859634fc3cb9098d24e276945
parente41d544a5e29328fc115809aa5b88d092e4fa21e
Merge from trunk.